Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Wed, 2 Jun 2010 22:44:58 +0000 (22:44 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Wed, 2 Jun 2010 22:44:58 +0000 (22:44 +0000)
commit4e60d9bd2aff005985632aa59cdd23a533e80a29
treebad787f80056b797e5f62a314269d401d45e90dc
parent18b42e2f647c90c0e1f63c07a601dd99c10d4162
parent2aa2a6070b0be86951c5efd708453bd348aa4c23
Merge from mainline.